bump: cardinal pins to v2.5.105 (v1) and v3.0.1 (v2)#1600
Merged
sre-ci-robot merged 1 commit intoApr 23, 2026
Merged
Conversation
Both CARDINAL_VERSION pins were stuck at tags cut before the KNOHWERE_DECLARE_CONFIG -> KNOWHERE_DECLARE_CONFIG rename done in knowhere PR zilliztech#1577 (commit c884fd8) and the corresponding cardinal fixes: - cardinalv1 pin v2.5.104 -> v2.5.105: includes zilliztech/cardinal#824 and zilliztech#825 (rename on the v1 branch). - cardinalv2 pin v3.0.0 -> v3.0.1: includes zilliztech/cardinal#823 (rename on master). v3.0.1 also pulls in zilliztech/cardinal#809 (Migrate to Conan 2.x), which is already the case on knowhere main since zilliztech#1495. Without this bump every WITH_CARDINAL=ON build (knowhere/nightly-2.0 x86 and knowhere/cardinal e2e (arm)) fails to compile with: cardinalv{1,2}/know/cardinal_config.h:33:5: error: ISO C++ forbids declaration of 'KNOHWERE_DECLARE_CONFIG' with no type These two new tags were cut from the post-fix tips of the v1 and master branches in cardinal. Signed-off-by: jamesgao-jpg <james.gao@zilliz.com>
foxspy
approved these changes
Apr 23, 2026
Collaborator
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: foxspy, jamesgao-jpg The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Bump the two
CARDINAL_VERSIONpins to the new tags cut from the post-typo-fix tips of cardinal:cmake/libs/cardinal/v1/CMakeLists.txtv2.5.104v2.5.105cmake/libs/cardinal/v2/CMakeLists.txtv3.0.0v3.0.1Why
#1577 (commit c884fd8) renamed the macro definition in
include/knowhere/config.h:The two cardinal vendored copies were pinned at tags cut before the corresponding cardinal-side renames landed, so every
WITH_CARDINAL=ONbuild fails:Observed in:
knowhere/nightly-2.0(x86) from build Knowhere cannot be compiled using clang-19 #822 onwardknowhere/cardinal e2e (arm)on PR-823This bump consumes the corresponding fix releases on the cardinal side and unblocks both pipelines.
Notes
v3.0.1also pulls in cardinal's Conan 2.x migration (Refactor knowhere UT #809). Knowhere main already requires Conan 2.x since #1495, so this is a non-issue here, but worth noting for any downstream consumer that pins by tag.git fetch --tags --forceafter this lands so the new tag refs are visible locally.Test
pre-commit run --files cmake/libs/cardinal/v1/CMakeLists.txt cmake/libs/cardinal/v2/CMakeLists.txt— clean.